* help-fns.el (describe-variable): Fix case where value is directory-local

with no dir-locals file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8dbe8e8cee3f839b8382cb65c174a629ac965b85..72caa6528406998238cc24ab32dc2b932ec39a52 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-08  Ingo Lohmar  <i.lohmar@gmail.com>
+
+       * help-fns.el (describe-variable): Fix the case where
+       a value is directory-local with no dir-locals file.  (Bug#16635)
+
 2014-02-08  Glenn Morris  <rgm@gnu.org>
 
        * abbrev.el (edit-abbrevs-mode):

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 5e38de88f72bfa5099ab5f5acd61efe20c9d71d5..028f6ac0c309d408b338a80cd4a9c7f30bfc1255 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -930,7 +930,8 @@ if it is given a local binding.\n")))
                                 (setq file (expand-file-name
                                             dir-locals-file (car file)))
                               ;; Otherwise, assume it was set directly.
-                              (setq dir-file nil)))
+                              (setq file (car file)
+                                    dir-file nil)))
                        (princ (if dir-file
                                   "by the file\n  `"
                                 "for the directory\n  `"))